From f412d947c5162435f899dc9e5751a67a924e2fe6 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 14 Feb 2002 16:18:32 +0000 Subject: [PATCH] Fix bug where we called get_surrounding on the context,. not the slave. Thu Feb 14 11:13:22 2002 Owen Taylor * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding): Fix bug where we called get_surrounding on the context,. not the slave. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkimmulticontext.c | 2 +- 8 files changed, 43 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 19125dda71..b496f4b59d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Feb 14 11:13:22 2002 Owen Taylor + + * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding): + Fix bug where we called get_surrounding on the context,. + not the slave. + Thu Feb 14 00:10:09 2002 Owen Taylor * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 19125dda71..b496f4b59d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Thu Feb 14 11:13:22 2002 Owen Taylor + + * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding): + Fix bug where we called get_surrounding on the context,. + not the slave. + Thu Feb 14 00:10:09 2002 Owen Taylor * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 19125dda71..b496f4b59d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Feb 14 11:13:22 2002 Owen Taylor + + * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding): + Fix bug where we called get_surrounding on the context,. + not the slave. + Thu Feb 14 00:10:09 2002 Owen Taylor * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 19125dda71..b496f4b59d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Thu Feb 14 11:13:22 2002 Owen Taylor + + * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding): + Fix bug where we called get_surrounding on the context,. + not the slave. + Thu Feb 14 00:10:09 2002 Owen Taylor * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 19125dda71..b496f4b59d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Feb 14 11:13:22 2002 Owen Taylor + + * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding): + Fix bug where we called get_surrounding on the context,. + not the slave. + Thu Feb 14 00:10:09 2002 Owen Taylor * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 19125dda71..b496f4b59d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Feb 14 11:13:22 2002 Owen Taylor + + * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding): + Fix bug where we called get_surrounding on the context,. + not the slave. + Thu Feb 14 00:10:09 2002 Owen Taylor * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 19125dda71..b496f4b59d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Feb 14 11:13:22 2002 Owen Taylor + + * gtk/gtkimmulticontext.c (gtk_im_multicontext_get_surrounding): + Fix bug where we called get_surrounding on the context,. + not the slave. + Thu Feb 14 00:10:09 2002 Owen Taylor * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c index f95ef3e705..3abb72f24d 100644 --- a/gtk/gtkimmulticontext.c +++ b/gtk/gtkimmulticontext.c @@ -353,7 +353,7 @@ gtk_im_multicontext_get_surrounding (GtkIMContext *context, GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext); if (slave) - return gtk_im_context_get_surrounding (context, text, cursor_index); + return gtk_im_context_get_surrounding (slave, text, cursor_index); else { if (text) -- 2.30.2